Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add local ffmpeg and MediaMTX builds to Docker #3353

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

j0sh
Copy link
Collaborator

@j0sh j0sh commented Jan 16, 2025

This is needed in order to support Opus (enhanced RTMP) for audio pass through.

The MediaMTX changes have been submitted upstream; hopefully they will get merged soon and we can go back to using off the shelf releases.

@github-actions github-actions bot added the docker Pull requests that update Docker code label Jan 16, 2025
@j0sh j0sh force-pushed the ja/update-ffmpeg branch 2 times, most recently from 9bbcd73 to 6e253ee Compare January 31, 2025 01:18
@j0sh j0sh changed the title Add local ffmpeg build to Docker, bump MediaMTX version. Add local ffmpeg and MediaMTX builds to Docker Jan 31, 2025
@j0sh j0sh marked this pull request as ready for review January 31, 2025 01:19
This is needed in order to support Opus (enhanced RTMP)
&& mv /opt/mediamtx/mediamtx /usr/local/bin/mediamtx \
&& mv /opt/mediamtx/mediamtx.yml /etc/mediamtx/mediamtx.yml \
&& rm -rf /opt/mediamtx/
# Copy artifacts from the builder stage
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since this is temporary, should we put the removed snippet as comments instead of deleting completely?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and update the MEDIAMTX_VERSION with v1.11.2-livepeer-1 as we track that version field for alerts in deployments/version mismatches.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm ok with still deleting, we have the git history to go back to. not really a big fan of commented out code

@@ -30,6 +30,11 @@ RUN GRPC_HEALTH_PROBE_VERSION=v0.3.6 \
&& chmod +x /usr/bin/grpc_health_probe \
&& ldconfig /usr/local/lib

RUN FFMPEG_SHA=b76053d8bf322b197a9d07bd27bbdad14fd5bc15 git clone --depth 1 https://git.ffmpeg.org/ffmpeg.git /ffmpeg \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought we already had local ffmpeg for rtmp input and output 😕
https://github.com/livepeer/go-livepeer/blob/master/media/rtmp2segment.go#L59

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh I see now, you've removed the apt install and are compiling it instead

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docker Pull requests that update Docker code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants